* admin/automerge: Abort if NEWS gets modified.

diff --git a/admin/automerge b/admin/automerge
index e88711f8d6dd0b37be4214d3225bafd1eee8c98f..b320369d17432cea20f702671cab7d165d573b75 100755 (executable)
--- a/admin/automerge
+++ b/admin/automerge
@@ -174,6 +174,12 @@ merge ()
 merge
 
 
+## FIXME it would be better to trap this in gitmerge.
+## NEWS should never be modified, only eg NEWS.26.
+git diff --stat --cached origin/master | grep -q "NEWS " && \
+    die "NEWS has been modified"
+
+
 [ "$build" ] || exit 0